From ab1e109534e807eff7ed095386535d8ca5fa0f1b Mon Sep 17 00:00:00 2001
From: oliskoli <oliskoli@f51c46e8-681c-474f-0cfe-069cfd0219fb>
Date: Tue, 4 Oct 2005 22:39:33 +0000
Subject: [PATCH] Sync changes with source tree; rel. 0.2

---
 gpsbabel/win32/gui-2/filter.dfm               | Bin 7565 -> 7837 bytes
 gpsbabel/win32/gui-2/filter.pas               |  42 +++-
 .../gui-2/locale/de/LC_MESSAGES/default.po    | 230 ++++++++++--------
 .../gui-2/locale/fr/LC_MESSAGES/default.po    | 220 +++++++++--------
 gpsbabel/win32/gui-2/main.dfm                 | Bin 22419 -> 22480 bytes
 gpsbabel/win32/gui-2/main.pas                 |  46 ++--
 gpsbabel/win32/gui-2/template.po              | 222 +++++++++--------
 7 files changed, 437 insertions(+), 323 deletions(-)

diff --git a/gpsbabel/win32/gui-2/filter.dfm b/gpsbabel/win32/gui-2/filter.dfm
index 561c938f3ededa7eca91cf061dc91953b1e858cc..8f64d00c480eb1b7e3f1d08fa9c8afb6efff68be 100644
GIT binary patch
delta 490
zcmZ{f&1(}u7>D!DHk)l@HZiW1SW>4)5p0frP%4I&6e3&WfDkXv?#}K`o9ryRBlhFq
zO%N26x8li@py#qzFP^;V#eYEXpq{-5f<_|+58fZ1-}8HP`T0uo=Uj=c53a3m^x4{=
z)M-3ee9}a44_{t{s!PnCkWs9SXT?{zZa@P&RR=fAAMuA-$1CP*T(lO7Q<Vz92|Qzc
z0H^q74GFZ-t=@$#d|Q1--T*$Fdx4i~2Vmp-+GD8WZM%JMmUUy{Z(mhAj_<LI``ZJa
zM1sk&7^+0f^hKzR1~HgQNw0iU20A9^|K^b6Gd-DT^X!dShMMM@XL>o;Dy7~o9VwrW
zsGfNCCLXH7Fc-Sg<*Ak`F$o)1))Ma3M<TE+#yvL+L`G`3Z=VCVcx68|oCv0S#?gPW
zgqzJS>=y^kfWT+`?r>-ow@yZI?1(Y$m+;V@FFwte%d6AA3mb_)x)TVRs!486J)Vnz
zs)XuT$c(0$+L2?acd1s?7m3a$;eXKL%R&d}RMP5mE%k4U3jd|B)n-dm=yYEt(SN9M
GoBjgE*PcWG

delta 227
zcmbPh+iNZKpNk>HEy&l+(<j6=h`~UhQg))yWJa%z%PbkWy_ncMQZv&tN|>i?e#IEb
z%*a34fLmm80P90WfyqW}rx*n%%X3I=7H4N?ocxDPda@<QuE}y7oSXk}1TirxPWI<6
zXDpd~ockQpX~xMtT#F}L@lIjnoqV2m0wdq#1U}ixy!@JsUYpJNr!tGAFtUbcrj%qb
z!|h~JnfyS=nXz)Sif{@O<I~BVqKS;Mn_r8jGxEUIFt;&GcH|e^Tq4fOx_O6;0psK{
P7U9X#a*kknf*daZ({Vza

diff --git a/gpsbabel/win32/gui-2/filter.pas b/gpsbabel/win32/gui-2/filter.pas
index e3e4da0f3..a902af903 100644
--- a/gpsbabel/win32/gui-2/filter.pas
+++ b/gpsbabel/win32/gui-2/filter.pas
@@ -79,6 +79,7 @@ type
     lbWayptRadiusLon: TLabel;
     edWayptRadiusLat: TEdit;
     edWayptRadiusLon: TEdit;
+    cbTrackRangeTimeZone: TCheckBox;
     procedure cbTrackTimeClick(Sender: TObject);
     procedure FormCreate(Sender: TObject);
     procedure cbTrackTitleClick(Sender: TObject);
@@ -182,9 +183,16 @@ begin
 end;
 
 procedure TfrmFilter.FormCreate(Sender: TObject);
+var
+  CurrentTime: TDateTime;
+
 begin
   gnugettextD4.TranslateComponent(SELF);
-  
+
+  CurrentTime := SysUtils.Now;
+  dtpTrackStartDate.DateTime := Int(CurrentTime);
+  dtpTrackStopDate.DateTime := Int(CurrentTime);
+
   lTrackTimeList := TList.Create;
   
   lTrackTimeList.Add(edTrackTimeDays);
@@ -216,6 +224,7 @@ begin
   FixPosition(edWayptRadiusLon, lbWayptRadiusLon, True);
 
   // will not be translated, fill by hand
+
   cobWayptMergeDist.Items.Add(_('Feet'));
   cobWayptMergeDist.Items.Add(_('Meter'));
   cobWayptMergeDist.ItemIndex := 0;
@@ -223,6 +232,8 @@ begin
   cobWayptRadius.Items.Add(_('Miles'));
   cobWayptRadius.Items.Add(_('Kilometer'));
   cobWayptRadius.ItemIndex := 0;
+
+  dtpTrackStopTime.Time := 1 - (1.0 / (24*60*60));
 end;
 
 procedure TfrmFilter.cbTrackTitleClick(Sender: TObject);
@@ -240,6 +251,9 @@ function TfrmFilter.CmdLine: string;
 
 var
   s: string;
+  tz_Info: TTimeZoneInformation;
+  dt: TDateTime;
+  dt_bias: TDateTime;
 begin
   Result := '';
   if not AnyChecked(Self) then Exit;
@@ -298,16 +312,30 @@ begin
     if cbTrackSplit.Checked then
       Result := Format('%s,split', [Result]);
 
+    if (cbTrackRangeTimeZone.Enabled and cbTrackRangeTimeZone.Checked) then
+    begin
+      Windows.GetTimeZoneInformation(tz_Info);
+      tz_Info.Bias := tz_Info.Bias + tz_Info.DaylightBias;
+      dt_bias := tz_Info.Bias / (24*60);
+    end
+    else
+      dt_bias := 0.0;
+
+
     if cbTrackStart.Checked then
+    begin
+      dt := Int(dtpTrackStartDate.DateTime) + Frac(dtpTrackStartTime.DateTime) + dt_bias;
       Result := Format('%s,start=%s', [
         Result,
-        FormatDateTime('yyyymmddhhnnss',
-          Int(dtpTrackStartDate.DateTime) + Frac(dtpTrackStartTime.DateTime))]);
+        FormatDateTime('yyyymmddhhnnss', dt)]);
+    end;
     if cbTrackStop.Checked then
+    begin
+      dt := Int(dtpTrackStopDate.DateTime) + Frac(dtpTrackStopTime.DateTime) + dt_bias;
       Result := Format('%s,stop=%s', [
         Result,
-        FormatDateTime('yyyymmddhhnnss',
-          Int(dtpTrackStopDate.DateTime) + Frac(dtpTrackStopTime.DateTime))]);
+        FormatDateTime('yyyymmddhhnnss', dt)]);
+    end;
   end;
 
   if AnyChecked(gbRoutes) then
@@ -360,12 +388,16 @@ procedure TfrmFilter.cbTrackStartClick(Sender: TObject);
 begin
   dtpTrackStartDate.Enabled := cbTrackStart.Checked;
   dtpTrackStartTime.Enabled := cbTrackStart.Checked;
+  cbTrackRangeTimeZone.Enabled :=
+    cbTrackStart.Checked or cbTrackStop.Checked;
 end;
 
 procedure TfrmFilter.cbTrackStopClick(Sender: TObject);
 begin
   dtpTrackStopDate.Enabled := cbTrackStop.Checked;
   dtpTrackStopTime.Enabled := cbTrackStop.Checked;
+  cbTrackRangeTimeZone.Enabled :=
+    cbTrackStart.Checked or cbTrackStop.Checked;
 end;
 
 procedure TfrmFilter.cbRouteSimplifyClick(Sender: TObject);
diff --git a/gpsbabel/win32/gui-2/locale/de/LC_MESSAGES/default.po b/gpsbabel/win32/gui-2/locale/de/LC_MESSAGES/default.po
index 7a1ad93bb..46271375e 100644
--- a/gpsbabel/win32/gui-2/locale/de/LC_MESSAGES/default.po
+++ b/gpsbabel/win32/gui-2/locale/de/LC_MESSAGES/default.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: GPSBabel 1.2.6\n"
 "POT-Creation-Date: 2005-08-12 14:50\n"
-"PO-Revision-Date: 2005-10-01 00:50+0100\n"
+"PO-Revision-Date: 2005-10-05 00:05+0100\n"
 "Last-Translator: Olaf Klein <o.b.klein@t-online.de>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr "Über"
 #: about.dfm:166
 #: filter.dfm:13
 #: main.dfm:11
-#: main.dfm:244
+#: main.dfm:245
 #: readme.dfm:11
 msgid "MS Sans Serif"
 msgstr "MS Sans Serif"
@@ -82,16 +82,6 @@ msgstr "Das Windows-Fontend für \"gpsbabel.exe\""
 msgid "THIS SOFTWARE MAY ONLY BE LICENSED FREE OF CHARGE"
 msgstr "DIESE SOFTWARE KANN UND DARF NUR KOSTENLOS WEITERGEGEBEN WERDEN"
 
-#. frmAbout..pnClient..pnCenter..lbxTranslators....Items.Strings
-#: about.dfm:183
-msgid "German by Olaf Klein"
-msgstr "Deutsch von Olaf Klein"
-
-#. frmAbout..pnClient..pnCenter..lbxTranslators....Items.Strings
-#: about.dfm:184
-msgid "French by Lilian Morinon"
-msgstr "Französich von Lilian Morinon"
-
 #. frmFilter..Caption
 #: filter.dfm:6
 msgid "Filter"
@@ -100,7 +90,7 @@ msgstr "Filter"
 #. frmFilter..gbTracks..Caption
 #. frmMain..Panel2..cbTracks..Caption
 #: filter.dfm:29
-#: main.dfm:399
+#: main.dfm:400
 msgid "&Tracks"
 msgstr "&Tracks"
 
@@ -192,140 +182,165 @@ msgstr "&Packen (oder)"
 #. frmFilter..gbTracks..cbTrackMerge..Hint
 #: filter.dfm:284
 msgid "Merge all tracks into one track"
-msgstr ""
+msgstr "Fasse alle Tracks zu einem einzigen zusammen (doppelte Zeitstempel werden verworfen)"
 
 #. frmFilter..gbTracks..cbTrackMerge..Caption
 #: filter.dfm:285
 msgid "Merge"
 msgstr "Zusammenführen"
 
+#. frmFilter..gbTracks..cbTrackRangeTimeZone..Hint
+#: filter.dfm:294
+msgid "Shift start/stop by local timezone offset"
+msgstr "Verschiebe Beginn/Ende um Differenz zur lokalen Zeitzone"
+
+#. frmFilter..gbTracks..cbTrackRangeTimeZone..Caption
+#: filter.dfm:295
+msgid "TZ"
+msgstr "\"TZ\""
+
 #. frmFilter..gbRoutes..Caption
-#: filter.dfm:296
+#: filter.dfm:306
 msgid "&Routes && Tracks"
 msgstr "&Routen && Tracks"
 
 #. frmFilter..gbRoutes..lbRouteSimplifyCount..Caption
-#: filter.dfm:304
+#: filter.dfm:314
 msgid "limit to"
 msgstr "maximal"
 
 #. frmFilter..gbRoutes..lbRouteSimplifyText..Caption
-#: filter.dfm:312
+#: filter.dfm:322
 msgid "Points"
 msgstr "Punkte"
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Hint
-#: filter.dfm:319
+#: filter.dfm:329
 msgid "Simplify routes and tracks by limited number of points"
 msgstr "Limitiert die Anzahl von Wegpunkten in Routen und Tracks"
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Caption
-#: filter.dfm:320
+#: filter.dfm:330
 msgid "Simplify"
 msgstr "Vereinfachen"
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Hint
-#: filter.dfm:329
+#: filter.dfm:339
 msgid "Upper limit of points for routes and tracks"
 msgstr "Maximale Anzahl an Punkten innerhalb von Routen und Tracks"
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Text
-#: filter.dfm:334
+#: filter.dfm:344
 msgid "50 "
 msgstr "50 "
 
 #. frmFilter..gbRoutes..cbReverse..Hint
-#: filter.dfm:353
+#: filter.dfm:363
 msgid "Reverse routes and tracks"
 msgstr "Reihenfolge von Wegpunkten in Routen und Tracks umdrehen"
 
 #. frmFilter..gbRoutes..cbReverse..Caption
-#: filter.dfm:354
+#: filter.dfm:364
 msgid "Reverse"
 msgstr "Umdrehen"
 
 #. frmFilter..pnBottom..btnOK..Caption
-#: filter.dfm:371
+#: filter.dfm:381
 msgid "OK"
 msgstr "OK"
 
 #. frmFilter..pnBottom..BitBtn1..Caption
-#: filter.dfm:407
+#: filter.dfm:417
 msgid "File based filters"
 msgstr "Datei basierende Filter"
 
 #. frmFilter..gbWaypoints..Caption
 #. frmMain..Panel2..cbWaypoints..Caption
-#: filter.dfm:427
-#: main.dfm:379
+#: filter.dfm:437
+#: main.dfm:380
 msgid "&Waypoints"
 msgstr "&Wegpunkte"
 
 #. frmFilter..gbWaypoints..lbWayptRadiusLat..Caption
-#: filter.dfm:436
+#: filter.dfm:446
 msgid "Latitude"
-msgstr "Längengrad"
+msgstr "Breitengrad"
 
 #. frmFilter..gbWaypoints..lbWayptRadiusLon..Caption
-#: filter.dfm:444
+#: filter.dfm:454
 msgid "Longitude"
-msgstr "Breitengrad"
+msgstr "Längengrad"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Hint
-#: filter.dfm:452
+#: filter.dfm:462
 msgid "Merge waypoints with duplicate locations"
 msgstr "Fasse Wegpunkte mit gleichen Koordinaten zusammen"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Caption
-#: filter.dfm:453
+#: filter.dfm:463
 msgid "locations"
 msgstr "Koordinaten"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Hint
-#: filter.dfm:462
+#: filter.dfm:472
 msgid "Merge waypoints with duplicate \"short name\""
 msgstr "Fasse Wegpunkte mit gleichem Namen zusammen"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Caption
-#: filter.dfm:463
+#: filter.dfm:473
 msgid "\"short names\""
 msgstr "\"Kurznamen\""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Hint
-#: filter.dfm:472
+#: filter.dfm:482
 msgid "Merge waypoints separated by less then"
-msgstr ""
+msgstr "Fasse alle Wegpunkte zusammen, die weniger als ... auseinander liegen"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Caption
-#: filter.dfm:473
+#: filter.dfm:483
 msgid "Position"
 msgstr "Position"
 
 #. frmFilter..gbWaypoints..cbWayptSort..Hint
-#: filter.dfm:501
+#: filter.dfm:511
 msgid "Sort waypoints by \"short name\" or by description"
 msgstr "Sortiere Wegpunkte nach Name oder Beschreibung"
 
 #. frmFilter..gbWaypoints..cbWayptSort..Caption
-#: filter.dfm:502
+#: filter.dfm:512
 msgid "Sort"
 msgstr "Sortieren"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Hint
-#: filter.dfm:510
+#: filter.dfm:520
 msgid "Merge duplicate waypoints"
 msgstr "Entferne doppelte Wegpunkte"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Caption
-#: filter.dfm:511
+#: filter.dfm:521
 msgid "Duplicatates"
 msgstr "Duplikate"
 
+#. frmFilter..gbWaypoints..cbWayptRadius..Hint
+#: filter.dfm:530
+msgid "Include points based on their proximity to central point"
+msgstr "Übernehme nur Punkte mit Entfernung von maximal ... um Mittelpunkt ..."
+
 #. frmFilter..gbWaypoints..cbWayptRadius..Caption
-#: filter.dfm:520
+#: filter.dfm:531
 msgid "Radius"
 msgstr "Radius"
 
+#. frmFilter..gbWaypoints..edWayptRadiusLat..Hint
+#: filter.dfm:559
+msgid "Latitude of central point"
+msgstr "Breitengrad (Latitude) des Mittelpunktes"
+
+#. frmFilter..gbWaypoints..edWayptRadiusLon..Hint
+#: filter.dfm:569
+msgid "Longitude of central point"
+msgstr "Längengrad (Longitude) des Mittelpunktes"
+
 #. frmMain..Caption
 #. Programmer's name for it: SGPSBabelTitle
 #: main.dfm:6
@@ -355,155 +370,160 @@ msgstr "Ausgabe-Format"
 
 #. frmMain..Panel1..chbInputDevice..Caption
 #. frmMain..Panel1..chbOutputDevice..Caption
-#: main.dfm:152
-#: main.dfm:204
+#: main.dfm:153
+#: main.dfm:205
 msgid "Device"
 msgstr "Gerät"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:165
-#: main.dfm:217
+#: main.dfm:166
+#: main.dfm:218
 msgid "USB"
 msgstr "USB"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:166
-#: main.dfm:218
+#: main.dfm:167
+#: main.dfm:219
 msgid "COM1"
 msgstr "COM1"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:167
-#: main.dfm:219
+#: main.dfm:168
+#: main.dfm:220
 msgid "COM2"
 msgstr "COM2"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:168
-#: main.dfm:220
+#: main.dfm:169
+#: main.dfm:221
 msgid "COM3"
 msgstr "COM3"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:169
-#: main.dfm:221
+#: main.dfm:170
+#: main.dfm:222
 msgid "COM4"
 msgstr "COM4"
 
 #. frmMain..Panel2..lbWhat..Caption
-#: main.dfm:240
+#: main.dfm:241
 msgid "What ?"
 msgstr "Was?"
 
 #. frmMain..Panel2..cbRoutes..Caption
-#: main.dfm:390
+#: main.dfm:391
 msgid "&Routes"
 msgstr "&Routen"
 
 #. frmMain..Panel2..btnFilter..Caption
 #. frmMain..ActionList1..acFilterSelect..Caption
-#: main.dfm:410
-#: main.dfm:915
+#: main.dfm:411
+#: main.dfm:917
 msgid "&Filter"
 msgstr "&Filter"
 
 #. frmMain..Panel2..btnProcess..Caption
 #. frmMain..ActionList1..acConvert..Caption
-#: main.dfm:434
-#: main.dfm:908
+#: main.dfm:435
+#: main.dfm:910
 msgid "let's go"
 msgstr "und los"
 
 #. frmMain..memoOutput..Font.Name
-#: main.dfm:461
+#: main.dfm:462
 msgid "Fixedsys"
 msgstr "Fixedsys"
 
 #. frmMain..stbMain........Text
-#: main.dfm:481
+#: main.dfm:482
 msgid "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"
 msgstr "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"
 
 #. frmMain..OpenDialog..Filter
-#: main.dfm:488
-msgid "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|All files|*.*"
-msgstr "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|All files|*.*"
+#: main.dfm:489
+msgid "Garmin Mapsource mps|*.mps|All files|*.*"
+msgstr "Garmin Mapsource mps|*.mps|Alle Dateien|*.*"
+
+#. frmMain..SaveDialog..Filter
+#: main.dfm:495
+msgid "All file(s)|*.*|Garmin MapSource mps|*.mps"
+msgstr "Alle Dateien|*.*|Garmin MapSource mps|*.mps"
 
 #. frmMain..ActionList1..acConvert..Category
 #. frmMain..ActionList1..acFilterSelect..Category
-#: main.dfm:907
-#: main.dfm:914
+#: main.dfm:909
+#: main.dfm:916
 msgid "Babel"
 msgstr "Babel"
 
 #. frmMain..ActionList1..acFileExit..Category
-#: main.dfm:920
+#: main.dfm:922
 msgid "File"
 msgstr "Datei"
 
 #. frmMain..ActionList1..acFileExit..Caption
-#: main.dfm:921
+#: main.dfm:923
 msgid "E&xit"
 msgstr "Beenden"
 
 #. frmMain..ActionList1..acHelpAbout..Category
 #. frmMain..ActionList1..acHelpIntro..Category
 #. frmMain..ActionList1..acHelpReadme..Category
-#: main.dfm:926
-#: main.dfm:931
-#: main.dfm:935
+#: main.dfm:928
+#: main.dfm:933
+#: main.dfm:937
 msgid "Help"
 msgstr "Hilfe"
 
 #. frmMain..ActionList1..acHelpAbout..Caption
-#: main.dfm:927
+#: main.dfm:929
 msgid "&About"
 msgstr "Über"
 
 #. frmMain..ActionList1..acHelpIntro..Caption
-#: main.dfm:932
+#: main.dfm:934
 msgid "&Intro"
 msgstr "Einführung"
 
 #. frmMain..ActionList1..acHelpReadme..Caption
 #. frmReadme..Caption
-#: main.dfm:936
+#: main.dfm:938
 #: readme.dfm:6
 msgid "GPSBabel README"
 msgstr "GPSBabel README"
 
 #. frmMain..MainMenu1..mnuFile..Caption
-#: main.dfm:945
+#: main.dfm:947
 msgid "&File"
 msgstr "&Datei"
 
 #. frmMain..MainMenu1..mnuOptions..Caption
-#: main.dfm:951
+#: main.dfm:953
 msgid "&Options"
 msgstr "&Optionen"
 
 #. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames..Caption
-#: main.dfm:953
+#: main.dfm:955
 msgid "Synthesize short names"
 msgstr "Synthetisiere Kurznamen"
 
 #. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames....Hint
-#: main.dfm:956
+#: main.dfm:958
 msgid "Ignore \"short\" names from source data and synthesize them from the long name"
-msgstr ""
+msgstr "Ignoriere alle \"Kurznamen\" und generiere diese neu aus Bechreibung oder Bemerkung"
 
 #. frmMain..MainMenu1..mnuHelp..Caption
-#: main.dfm:962
+#: main.dfm:964
 msgid "&Help"
 msgstr "&Hilfe"
 
 #. frmMain..MainMenu1..mnuHelp..N1..Caption
-#: main.dfm:970
+#: main.dfm:972
 msgid "-"
 msgstr "-"
 
@@ -511,73 +531,77 @@ msgstr "-"
 msgid "Version"
 msgstr "Version"
 
+#: about.pas:83
+msgid "German by Olaf Klein"
+msgstr "Deutsch von Olaf Klein"
+
+#: about.pas:84
+msgid "French by Lilian Morinon"
+msgstr "Französich von Lilian Morinon"
+
 #. Programmer's name for it: SGPSBabelURL
 #: common.pas:27
 msgid "http://www.gpsbabel.org"
 msgstr "http://www.gpsbabel.org"
 
-#: filter.pas:159
+#: filter.pas:160
 msgid "Value (%s) out of range (%g to %g)!"
 msgstr "Wert (%s) liegt außerhalb des zulässigen Bereiches  (%g to %g)!"
 
-#. will not be translated, fill by hand
-#: filter.pas:219
+#: filter.pas:228
 msgid "Feet"
 msgstr "\"Feet\" (engl.)"
 
-#: filter.pas:220
+#: filter.pas:229
 msgid "Meter"
 msgstr "Meter"
 
-#: filter.pas:223
+#: filter.pas:232
 msgid "Miles"
 msgstr "Meilen"
 
-#: filter.pas:224
+#: filter.pas:233
 msgid "Kilometer"
 msgstr "Kilometer"
 
-#: main.pas:165
+#: main.pas:167
 msgid "BETA"
 msgstr "BETA"
 
-#: main.pas:167
+#: main.pas:169
 msgid "Private release"
 msgstr "Private Version"
 
-#: main.pas:169
+#: main.pas:171
 msgid "Special release"
 msgstr "Spezial-Version"
 
-#: main.pas:277
+#: main.pas:279
+#: main.pas:374
 msgid "All files|*.*"
 msgstr "Alle Dateien|*.*"
 
-#: main.pas:366
-msgid "|All files|*.*"
-msgstr "|Alle Dateien|*.*"
-
-#: main.pas:407
+#: main.pas:415
 msgid "File %s not found."
 msgstr "Datei \"%s\" nicht gefunden."
 
-#: main.pas:424
+#: main.pas:432
 msgid "File \"%s\" exists ! Overwrite ?"
 msgstr "Datei \"%s\" existiert bereits! Überschreiben?"
 
-#: main.pas:425
+#: main.pas:433
 msgid "Warning"
 msgstr "Warnung"
 
-#: main.pas:450
+#: main.pas:458
 msgid "Could not run \"gpsbabel.exe\"!"
 msgstr "Konnte \"gpsbabel.exe\" nicht ausführen!"
 
-#: main.pas:459
+#: main.pas:467
 msgid "Converted successfully from \"%s\" to \"%s\"."
 msgstr "Erfolgreich konvertiert von \"%s\" zu \"%s\"."
 
-#: main.pas:460
+#: main.pas:468
 msgid "Success"
 msgstr "Erfolg"
 
diff --git a/gpsbabel/win32/gui-2/locale/fr/LC_MESSAGES/default.po b/gpsbabel/win32/gui-2/locale/fr/LC_MESSAGES/default.po
index ed229a96a..66b6ca743 100644
--- a/gpsbabel/win32/gui-2/locale/fr/LC_MESSAGES/default.po
+++ b/gpsbabel/win32/gui-2/locale/fr/LC_MESSAGES/default.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: French version\n"
 "POT-Creation-Date: 2005-09-22 23:44\n"
-"PO-Revision-Date: 2005-10-01 00:52+0100\n"
+"PO-Revision-Date: 2005-10-05 00:36+0100\n"
 "Last-Translator: Olaf Klein <o.b.klein@t-online.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -37,7 +37,7 @@ msgstr "A propos"
 #: about.dfm:166
 #: filter.dfm:13
 #: main.dfm:11
-#: main.dfm:244
+#: main.dfm:245
 #: readme.dfm:11
 msgid "MS Sans Serif"
 msgstr "MS Sans Serif"
@@ -88,16 +88,6 @@ msgstr "L'interface graphique de gpsbabel"
 msgid "THIS SOFTWARE MAY ONLY BE LICENSED FREE OF CHARGE"
 msgstr ""
 
-#. frmAbout..pnClient..pnCenter..lbxTranslators....Items.Strings
-#: about.dfm:183
-msgid "German by Olaf Klein"
-msgstr ""
-
-#. frmAbout..pnClient..pnCenter..lbxTranslators....Items.Strings
-#: about.dfm:184
-msgid "French by Lilian Morinon"
-msgstr ""
-
 #. frmFilter..Caption
 #: filter.dfm:6
 msgid "Filter"
@@ -106,7 +96,7 @@ msgstr "Filtre"
 #. frmFilter..gbTracks..Caption
 #. frmMain..Panel2..cbTracks..Caption
 #: filter.dfm:29
-#: main.dfm:399
+#: main.dfm:400
 msgid "&Tracks"
 msgstr "&Traces"
 
@@ -205,133 +195,158 @@ msgstr "Fusionner toutes les traces en une seule"
 msgid "Merge"
 msgstr "Fusionner"
 
+#. frmFilter..gbTracks..cbTrackRangeTimeZone..Hint
+#: filter.dfm:294
+msgid "Shift start/stop by local timezone offset"
+msgstr ""
+
+#. frmFilter..gbTracks..cbTrackRangeTimeZone..Caption
+#: filter.dfm:295
+msgid "TZ"
+msgstr ""
+
 #. frmFilter..gbRoutes..Caption
-#: filter.dfm:296
+#: filter.dfm:306
 msgid "&Routes && Tracks"
 msgstr "&Routes && Traces"
 
 #. frmFilter..gbRoutes..lbRouteSimplifyCount..Caption
-#: filter.dfm:304
+#: filter.dfm:314
 msgid "limit to"
 msgstr "limiter à"
 
 #. frmFilter..gbRoutes..lbRouteSimplifyText..Caption
-#: filter.dfm:312
+#: filter.dfm:322
 msgid "Points"
 msgstr ""
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Hint
-#: filter.dfm:319
+#: filter.dfm:329
 msgid "Simplify routes and tracks by limited number of points"
 msgstr "Simplifier les routes et traces en limitant le nombre de points"
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Caption
-#: filter.dfm:320
+#: filter.dfm:330
 msgid "Simplify"
 msgstr "Simplifier"
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Hint
-#: filter.dfm:329
+#: filter.dfm:339
 msgid "Upper limit of points for routes and tracks"
 msgstr "Limite maximum du nombre de points pour les routes et traces"
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Text
-#: filter.dfm:334
+#: filter.dfm:344
 msgid "50 "
 msgstr "50 "
 
 #. frmFilter..gbRoutes..cbReverse..Hint
-#: filter.dfm:353
+#: filter.dfm:363
 msgid "Reverse routes and tracks"
 msgstr "Inverser les routes et les traces"
 
 #. frmFilter..gbRoutes..cbReverse..Caption
-#: filter.dfm:354
+#: filter.dfm:364
 msgid "Reverse"
 msgstr "Inverser"
 
 #. frmFilter..pnBottom..btnOK..Caption
-#: filter.dfm:371
+#: filter.dfm:381
 msgid "OK"
 msgstr "OK"
 
 #. frmFilter..pnBottom..BitBtn1..Caption
-#: filter.dfm:407
+#: filter.dfm:417
 msgid "File based filters"
 msgstr "Filtres de fichiers"
 
 #. frmFilter..gbWaypoints..Caption
 #. frmMain..Panel2..cbWaypoints..Caption
-#: filter.dfm:427
-#: main.dfm:379
+#: filter.dfm:437
+#: main.dfm:380
 msgid "&Waypoints"
 msgstr ""
 
 #. frmFilter..gbWaypoints..lbWayptRadiusLat..Caption
-#: filter.dfm:436
+#: filter.dfm:446
 msgid "Latitude"
 msgstr ""
 
 #. frmFilter..gbWaypoints..lbWayptRadiusLon..Caption
-#: filter.dfm:444
+#: filter.dfm:454
 msgid "Longitude"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Hint
-#: filter.dfm:452
+#: filter.dfm:462
 msgid "Merge waypoints with duplicate locations"
 msgstr "Fusionner les waypoints avec les positions en doublon"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Caption
-#: filter.dfm:453
+#: filter.dfm:463
 msgid "locations"
 msgstr "positions"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Hint
-#: filter.dfm:462
+#: filter.dfm:472
 msgid "Merge waypoints with duplicate \"short name\""
 msgstr "Fusionner les waypoints avec les doublons \"short name\""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Caption
-#: filter.dfm:463
+#: filter.dfm:473
 msgid "\"short names\""
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Hint
-#: filter.dfm:472
+#: filter.dfm:482
 msgid "Merge waypoints separated by less then"
 msgstr "Fusionner les waypoints séparé par moins de"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Caption
-#: filter.dfm:473
+#: filter.dfm:483
 msgid "Position"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptSort..Hint
-#: filter.dfm:501
+#: filter.dfm:511
 msgid "Sort waypoints by \"short name\" or by description"
 msgstr "Trier les waypoints par \"short name\" ou par description"
 
 #. frmFilter..gbWaypoints..cbWayptSort..Caption
-#: filter.dfm:502
+#: filter.dfm:512
 msgid "Sort"
 msgstr "Trier"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Hint
-#: filter.dfm:510
+#: filter.dfm:520
 msgid "Merge duplicate waypoints"
 msgstr "Fusionner les waypoints identiques"
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Caption
-#: filter.dfm:511
+#: filter.dfm:521
 msgid "Duplicatates"
 msgstr "Doublons"
 
+#. frmFilter..gbWaypoints..cbWayptRadius..Hint
+#: filter.dfm:530
+msgid "Include points based on their proximity to central point"
+msgstr ""
+
 #. frmFilter..gbWaypoints..cbWayptRadius..Caption
-#: filter.dfm:520
+#: filter.dfm:531
 msgid "Radius"
 msgstr "Rayon"
 
+#. frmFilter..gbWaypoints..edWayptRadiusLat..Hint
+#: filter.dfm:559
+msgid "Latitude of central point"
+msgstr ""
+
+#. frmFilter..gbWaypoints..edWayptRadiusLon..Hint
+#: filter.dfm:569
+msgid "Longitude of central point"
+msgstr ""
+
 #. frmMain..Caption
 #. Programmer's name for it: SGPSBabelTitle
 #: main.dfm:6
@@ -361,155 +376,160 @@ msgstr "Format ci&ble"
 
 #. frmMain..Panel1..chbInputDevice..Caption
 #. frmMain..Panel1..chbOutputDevice..Caption
-#: main.dfm:152
-#: main.dfm:204
+#: main.dfm:153
+#: main.dfm:205
 msgid "Device"
 msgstr "Périphérique"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:165
-#: main.dfm:217
+#: main.dfm:166
+#: main.dfm:218
 msgid "USB"
 msgstr "USB"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:166
-#: main.dfm:218
+#: main.dfm:167
+#: main.dfm:219
 msgid "COM1"
 msgstr "COM1"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:167
-#: main.dfm:219
+#: main.dfm:168
+#: main.dfm:220
 msgid "COM2"
 msgstr "COM2"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:168
-#: main.dfm:220
+#: main.dfm:169
+#: main.dfm:221
 msgid "COM3"
 msgstr "COM3"
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:169
-#: main.dfm:221
+#: main.dfm:170
+#: main.dfm:222
 msgid "COM4"
 msgstr "COM4"
 
 #. frmMain..Panel2..lbWhat..Caption
-#: main.dfm:240
+#: main.dfm:241
 msgid "What ?"
 msgstr "Quoi ?"
 
 #. frmMain..Panel2..cbRoutes..Caption
-#: main.dfm:390
+#: main.dfm:391
 msgid "&Routes"
 msgstr ""
 
 #. frmMain..Panel2..btnFilter..Caption
 #. frmMain..ActionList1..acFilterSelect..Caption
-#: main.dfm:410
-#: main.dfm:915
+#: main.dfm:411
+#: main.dfm:917
 msgid "&Filter"
 msgstr "&Filtre"
 
 #. frmMain..Panel2..btnProcess..Caption
 #. frmMain..ActionList1..acConvert..Caption
-#: main.dfm:434
-#: main.dfm:908
+#: main.dfm:435
+#: main.dfm:910
 msgid "let's go"
 msgstr "Lancer"
 
 #. frmMain..memoOutput..Font.Name
-#: main.dfm:461
+#: main.dfm:462
 msgid "Fixedsys"
 msgstr "Fixedsys"
 
 #. frmMain..stbMain........Text
-#: main.dfm:481
+#: main.dfm:482
 msgid "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"
 msgstr "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"
 
 #. frmMain..OpenDialog..Filter
-#: main.dfm:488
-msgid "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|All files|*.*"
-msgstr "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|Tous les fichiers|*.*"
+#: main.dfm:489
+msgid "Garmin Mapsource mps|*.mps|All files|*.*"
+msgstr ""
+
+#. frmMain..SaveDialog..Filter
+#: main.dfm:495
+msgid "All file(s)|*.*|Garmin MapSource mps|*.mps"
+msgstr ""
 
 #. frmMain..ActionList1..acConvert..Category
 #. frmMain..ActionList1..acFilterSelect..Category
-#: main.dfm:907
-#: main.dfm:914
+#: main.dfm:909
+#: main.dfm:916
 msgid "Babel"
 msgstr "Babel"
 
 #. frmMain..ActionList1..acFileExit..Category
-#: main.dfm:920
+#: main.dfm:922
 msgid "File"
 msgstr "Fichier"
 
 #. frmMain..ActionList1..acFileExit..Caption
-#: main.dfm:921
+#: main.dfm:923
 msgid "E&xit"
 msgstr "F&ermer"
 
 #. frmMain..ActionList1..acHelpAbout..Category
 #. frmMain..ActionList1..acHelpIntro..Category
 #. frmMain..ActionList1..acHelpReadme..Category
-#: main.dfm:926
-#: main.dfm:931
-#: main.dfm:935
+#: main.dfm:928
+#: main.dfm:933
+#: main.dfm:937
 msgid "Help"
 msgstr "Aide"
 
 #. frmMain..ActionList1..acHelpAbout..Caption
-#: main.dfm:927
+#: main.dfm:929
 msgid "&About"
 msgstr "&A propos"
 
 #. frmMain..ActionList1..acHelpIntro..Caption
-#: main.dfm:932
+#: main.dfm:934
 msgid "&Intro"
 msgstr "&Introduction"
 
 #. frmMain..ActionList1..acHelpReadme..Caption
 #. frmReadme..Caption
-#: main.dfm:936
+#: main.dfm:938
 #: readme.dfm:6
 msgid "GPSBabel README"
 msgstr "GPSBabel README"
 
 #. frmMain..MainMenu1..mnuFile..Caption
-#: main.dfm:945
+#: main.dfm:947
 msgid "&File"
 msgstr "&Fichier"
 
 #. frmMain..MainMenu1..mnuOptions..Caption
-#: main.dfm:951
+#: main.dfm:953
 msgid "&Options"
 msgstr ""
 
 #. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames..Caption
-#: main.dfm:953
+#: main.dfm:955
 msgid "Synthesize short names"
 msgstr ""
 
 #. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames....Hint
-#: main.dfm:956
+#: main.dfm:958
 msgid "Ignore \"short\" names from source data and synthesize them from the long name"
 msgstr ""
 
 #. frmMain..MainMenu1..mnuHelp..Caption
-#: main.dfm:962
+#: main.dfm:964
 msgid "&Help"
 msgstr "&Aide"
 
 #. frmMain..MainMenu1..mnuHelp..N1..Caption
-#: main.dfm:970
+#: main.dfm:972
 msgid "-"
 msgstr "-"
 
@@ -517,73 +537,77 @@ msgstr "-"
 msgid "Version"
 msgstr ""
 
+#: about.pas:83
+msgid "German by Olaf Klein"
+msgstr ""
+
+#: about.pas:84
+msgid "French by Lilian Morinon"
+msgstr ""
+
 #. Programmer's name for it: SGPSBabelURL
 #: common.pas:27
 msgid "http://www.gpsbabel.org"
 msgstr "http://www.gpsbabel.org"
 
-#: filter.pas:159
+#: filter.pas:160
 msgid "Value (%s) out of range (%g to %g)!"
 msgstr ""
 
-#. will not be translated, fill by hand
-#: filter.pas:219
+#: filter.pas:228
 msgid "Feet"
 msgstr ""
 
-#: filter.pas:220
+#: filter.pas:229
 msgid "Meter"
 msgstr ""
 
-#: filter.pas:223
+#: filter.pas:232
 msgid "Miles"
 msgstr ""
 
-#: filter.pas:224
+#: filter.pas:233
 msgid "Kilometer"
 msgstr ""
 
-#: main.pas:165
+#: main.pas:167
 msgid "BETA"
 msgstr "BETA"
 
-#: main.pas:167
+#: main.pas:169
 msgid "Private release"
 msgstr ""
 
-#: main.pas:169
+#: main.pas:171
 msgid "Special release"
 msgstr ""
 
-#: main.pas:277
+#: main.pas:279
+#: main.pas:374
 msgid "All files|*.*"
 msgstr "Tous les fichiers|*.*"
 
-#: main.pas:366
-msgid "|All files|*.*"
-msgstr "|Tous les fichiers|*.*"
-
-#: main.pas:407
+#: main.pas:415
 msgid "File %s not found."
 msgstr "Fichier%s non trouvé."
 
-#: main.pas:424
+#: main.pas:432
 msgid "File \"%s\" exists ! Overwrite ?"
 msgstr "Le fichier \"%s\" existe déjà ! Ecraser ?"
 
-#: main.pas:425
+#: main.pas:433
 msgid "Warning"
 msgstr "Attention"
 
-#: main.pas:450
+#: main.pas:458
 msgid "Could not run \"gpsbabel.exe\"!"
 msgstr "Impossible d'éxécuter \"gpsbabel.exe\"!"
 
-#: main.pas:459
+#: main.pas:467
 msgid "Converted successfully from \"%s\" to \"%s\"."
 msgstr "Conversion de \"%s\" à \"%s\" réussie."
 
-#: main.pas:460
+#: main.pas:468
 msgid "Success"
 msgstr "Succès"
 
diff --git a/gpsbabel/win32/gui-2/main.dfm b/gpsbabel/win32/gui-2/main.dfm
index 1d4755dcc2aabbbf1d0b4cec0ea36fc2c0afd343..ae0b69b3c1c75e2fd9f032f2bd0dd1fbaa829a3f 100644
GIT binary patch
delta 127
zcmbQdp7FwZM*ja?3?XhozP^s0ehdZz`xf$ZDsuVfd8bwe6r~myvx}sr_?MOxl$N+<
z=A^<zH}i8Qi8E?U?o<dhW&=u;q!zJhIp*XjqyZIa6l>OK>1oxtCl=*q<|+6l76j*)
U7A2=D<Q5bIC4l7SdkS040Di<PTL1t6

delta 64
zcmcbxo^kSeM*ja?3?XhozP^s0ehdZzjSKlXHydy!iA&hKCl=*q<|+6l78K`~7A2?F
UXz8V=B-KowtPr|cT5+ox0I1&;j{pDw

diff --git a/gpsbabel/win32/gui-2/main.pas b/gpsbabel/win32/gui-2/main.pas
index 6e46e02c2..7bea74ab4 100644
--- a/gpsbabel/win32/gui-2/main.pas
+++ b/gpsbabel/win32/gui-2/main.pas
@@ -101,10 +101,12 @@ type
     procedure chbOutputDeviceClick(Sender: TObject);
     procedure acHelpReadmeExecute(Sender: TObject);
     procedure mnuSynthesizeShortNamesClick(Sender: TObject);
+    procedure edOutputFileKeyPress(Sender: TObject; var Key: Char);
   private
     { Private-Deklarationen }
     FCaps: TCapabilities;
     FFirstShow: Boolean;
+    FOutHandmade: Boolean;
     procedure AddToOutput(const Str: string);
     procedure AddToOutputFmt(const Format: string; const Args: array of const);
     procedure InitCombo(Target: TComboBox; ForRead, ForDevice: Boolean);
@@ -141,6 +143,15 @@ begin
     Control.Left := Right - Control.Width - ShiftLeft;
 end;
 
+function ComboBoxSelect(AComboBox: TComboBox; const Item: string): Boolean;
+var
+  i: Integer;
+begin
+  i := AComboBox.Items.IndexOf(Item);
+  AComboBox.ItemIndex := i;
+  Result := (i >= 0);
+end;
+
 { TfrmMain }
 
 procedure TfrmMain.FormCreate(Sender: TObject);
@@ -174,16 +185,10 @@ begin
   OpenDialog.InitialDir := ReadProfile(OpenDialog.Tag);
   SaveDialog.InitialDir := ReadProfile(SaveDialog.Tag);
 
-  s := ReadProfile(cbInputDevice.Tag);
-  if (s <> '') then
-    cbInputDevice.Text := s
-  else
+  if not ComboBoxSelect(cbInputDevice, ReadProfile(cbInputDevice.Tag)) then
     cbInputDevice.ItemIndex := 0;
 
-  s := ReadProfile(cbOutputDevice.Tag);
-  if (s <> '') then
-    cbOutputDevice.Text := s
-  else
+  if not ComboBoxSelect(cbOutputDevice, ReadProfile(cbOutputDevice.Tag)) then
     cbOutputDevice.ItemIndex := 0;
 
   FFirstShow := True;
@@ -229,7 +234,7 @@ begin
   LoadVersion;
   LoadFileFormats;
   
-  // README form
+  // ? valid README form
 
   acHelpReadme.Enabled := (frmReadme.Memo.Lines.Count > 0);
 end;
@@ -254,14 +259,8 @@ begin
   end;
 
   s := ReadProfile(Target.Tag);
+  ComboBoxSelect(Target, s);
 
-  i := FCaps.GetCaps(s);
-  if (i > 0) then
-  begin
-    i := Target.Items.IndexOf(s);
-    if (i >= 0) then
-      Target.ItemIndex := i;
-  end;
   ComboChange(Target);
 end;
 
@@ -289,6 +288,11 @@ var
 begin
   caps := FCaps.GetCaps(TComboBox(Sender).Text);
   ext := FCaps.GetExt(TComboBox(Sender).Text);
+  if FOutHandmade and (ext = '') then
+  begin
+    ext := SysUtils.ExtractFileExt(edOutputFile.Text);
+    if (ext <> '') and (ext[1] = '.') then Delete(ext, 1, 1);
+  end;
 
   if (Sender = cbInputFormat) then
   begin
@@ -301,8 +305,9 @@ begin
     wptOutputOK.Enabled := (caps and 2 <> 0);
     trkOutputOK.Enabled := (caps and 8 <> 0);
     rteOutputOK.Enabled := (caps and 32 <> 0);
-    if (edOutputFile.Text <> '') and (ext <> '') then
+    if (edOutputFile.Text <> '') then
     begin
+      if (ext <> '') then FOutHandmade := False;
       edOutputFile.Text := SysUtils.ChangeFileExt(edOutputFile.Text, '.' + ext);
     end;
   end;
@@ -363,7 +368,7 @@ begin
 
   if (cbOutputFormat.Text <> '') then
     s := cbOutputFormat.Text + '|*.' + FCaps.GetExt(cbOutputFormat.Text) + '|';
-  s := s + _('|All files|*.*');
+  s := s + _('All files|*.*');
 
   SaveDialog.Filter := s;
   if not SELF.SaveDialog.Execute then Exit;
@@ -598,5 +603,10 @@ begin
   mnuSynthesizeShortNames.Checked := not(mnuSynthesizeShortNames.Checked);
 end;
 
+procedure TfrmMain.edOutputFileKeyPress(Sender: TObject; var Key: Char);
+begin
+  FOutHandmade := True;
+end;
+
 end.
  
\ No newline at end of file
diff --git a/gpsbabel/win32/gui-2/template.po b/gpsbabel/win32/gui-2/template.po
index b92b31703..9c2f6a503 100644
--- a/gpsbabel/win32/gui-2/template.po
+++ b/gpsbabel/win32/gui-2/template.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2005-10-01 00:49\n"
-"PO-Revision-Date: 2005-10-01 00:49\n"
+"POT-Creation-Date: 2005-10-04 23:50\n"
+"PO-Revision-Date: 2005-10-04 23:50\n"
 "Last-Translator: Somebody <your.email@address.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -33,7 +33,7 @@ msgstr ""
 #. frmMain..Font.Name
 #: main.dfm:11
 #. frmMain..Panel2..lbWhat..Font.Name
-#: main.dfm:244
+#: main.dfm:245
 #. frmReadme..Font.Name
 #: readme.dfm:11
 msgid "MS Sans Serif"
@@ -87,16 +87,6 @@ msgid "THIS SOFTWARE MAY ONLY BE LICENSED FREE OF "
 "CHARGE"
 msgstr ""
 
-#. frmAbout..pnClient..pnCenter..lbxTranslators....Items.Strings
-#: about.dfm:183
-msgid "German by Olaf Klein"
-msgstr ""
-
-#. frmAbout..pnClient..pnCenter..lbxTranslators....Items.Strings
-#: about.dfm:184
-msgid "French by Lilian Morinon"
-msgstr ""
-
 #. frmFilter..Caption
 #: filter.dfm:6
 msgid "Filter"
@@ -105,7 +95,7 @@ msgstr ""
 #. frmFilter..gbTracks..Caption
 #: filter.dfm:29
 #. frmMain..Panel2..cbTracks..Caption
-#: main.dfm:399
+#: main.dfm:400
 msgid "&Tracks"
 msgstr ""
 
@@ -206,137 +196,163 @@ msgstr ""
 msgid "Merge"
 msgstr ""
 
+#. frmFilter..gbTracks..cbTrackRangeTimeZone..Hint
+#: filter.dfm:294
+msgid "Shift start/stop by local timezone offset"
+msgstr ""
+
+#. frmFilter..gbTracks..cbTrackRangeTimeZone..Caption
+#: filter.dfm:295
+msgid "TZ"
+msgstr ""
+
 #. frmFilter..gbRoutes..Caption
-#: filter.dfm:296
+#: filter.dfm:306
 msgid "&Routes && Tracks"
 msgstr ""
 
 #. frmFilter..gbRoutes..lbRouteSimplifyCount..Caption
-#: filter.dfm:304
+#: filter.dfm:314
 msgid "limit to"
 msgstr ""
 
 #. frmFilter..gbRoutes..lbRouteSimplifyText..Caption
-#: filter.dfm:312
+#: filter.dfm:322
 msgid "Points"
 msgstr ""
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Hint
-#: filter.dfm:319
+#: filter.dfm:329
 msgid "Simplify routes and tracks by limited number of "
 "points"
 msgstr ""
 
 #. frmFilter..gbRoutes..cbRouteSimplify..Caption
-#: filter.dfm:320
+#: filter.dfm:330
 msgid "Simplify"
 msgstr ""
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Hint
-#: filter.dfm:329
+#: filter.dfm:339
 msgid "Upper limit of points for routes and "
 "tracks"
 msgstr ""
 
 #. frmFilter..gbRoutes..edRoutesSimplifyMaxPoints..Text
-#: filter.dfm:334
+#: filter.dfm:344
 msgid "50 "
 msgstr ""
 
 #. frmFilter..gbRoutes..cbReverse..Hint
-#: filter.dfm:353
+#: filter.dfm:363
 msgid "Reverse routes and tracks"
 msgstr ""
 
 #. frmFilter..gbRoutes..cbReverse..Caption
-#: filter.dfm:354
+#: filter.dfm:364
 msgid "Reverse"
 msgstr ""
 
 #. frmFilter..pnBottom..btnOK..Caption
-#: filter.dfm:371
+#: filter.dfm:381
 msgid "OK"
 msgstr ""
 
 #. frmFilter..pnBottom..BitBtn1..Caption
-#: filter.dfm:407
+#: filter.dfm:417
 msgid "File based filters"
 msgstr ""
 
 #. frmFilter..gbWaypoints..Caption
-#: filter.dfm:427
+#: filter.dfm:437
 #. frmMain..Panel2..cbWaypoints..Caption
-#: main.dfm:379
+#: main.dfm:380
 msgid "&Waypoints"
 msgstr ""
 
 #. frmFilter..gbWaypoints..lbWayptRadiusLat..Caption
-#: filter.dfm:436
+#: filter.dfm:446
 msgid "Latitude"
 msgstr ""
 
 #. frmFilter..gbWaypoints..lbWayptRadiusLon..Caption
-#: filter.dfm:444
+#: filter.dfm:454
 msgid "Longitude"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Hint
-#: filter.dfm:452
+#: filter.dfm:462
 msgid "Merge waypoints with duplicate locations"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupLoc..Caption
-#: filter.dfm:453
+#: filter.dfm:463
 msgid "locations"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Hint
-#: filter.dfm:462
+#: filter.dfm:472
 msgid "Merge waypoints with duplicate \"short "
 "name\""
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDupNames..Caption
-#: filter.dfm:463
+#: filter.dfm:473
 msgid "\"short names\""
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Hint
-#: filter.dfm:472
+#: filter.dfm:482
 msgid "Merge waypoints separated by less then"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDistance..Caption
-#: filter.dfm:473
+#: filter.dfm:483
 msgid "Position"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptSort..Hint
-#: filter.dfm:501
+#: filter.dfm:511
 msgid "Sort waypoints by \"short name\" or by "
 "description"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptSort..Caption
-#: filter.dfm:502
+#: filter.dfm:512
 msgid "Sort"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Hint
-#: filter.dfm:510
+#: filter.dfm:520
 msgid "Merge duplicate waypoints"
 msgstr ""
 
 #. frmFilter..gbWaypoints..cbWayptMergeDups..Caption
-#: filter.dfm:511
+#: filter.dfm:521
 msgid "Duplicatates"
 msgstr ""
 
+#. frmFilter..gbWaypoints..cbWayptRadius..Hint
+#: filter.dfm:530
+msgid "Include points based on their proximity to central "
+"point"
+msgstr ""
+
 #. frmFilter..gbWaypoints..cbWayptRadius..Caption
-#: filter.dfm:520
+#: filter.dfm:531
 msgid "Radius"
 msgstr ""
 
+#. frmFilter..gbWaypoints..edWayptRadiusLat..Hint
+#: filter.dfm:559
+msgid "Latitude of central point"
+msgstr ""
+
+#. frmFilter..gbWaypoints..edWayptRadiusLon..Hint
+#: filter.dfm:569
+msgid "Longitude of central point"
+msgstr ""
+
 #. frmMain..Caption
 #: main.dfm:6
 #. Programmer's name for it: SGPSBabelTitle
@@ -365,158 +381,162 @@ msgid "Output f&ormat"
 msgstr ""
 
 #. frmMain..Panel1..chbInputDevice..Caption
-#: main.dfm:152
+#: main.dfm:153
 #. frmMain..Panel1..chbOutputDevice..Caption
-#: main.dfm:204
+#: main.dfm:205
 msgid "Device"
 msgstr ""
 
-#. frmMain..Panel1..cbInputDevice....Items.Strings
-#: main.dfm:165
-#. frmMain..Panel1..cbOutputDevice....Items.Strings
-#: main.dfm:217
-msgid "USB"
-msgstr ""
-
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #: main.dfm:166
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
 #: main.dfm:218
-msgid "COM1"
+msgid "USB"
 msgstr ""
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #: main.dfm:167
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
 #: main.dfm:219
-msgid "COM2"
+msgid "COM1"
 msgstr ""
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #: main.dfm:168
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
 #: main.dfm:220
-msgid "COM3"
+msgid "COM2"
 msgstr ""
 
 #. frmMain..Panel1..cbInputDevice....Items.Strings
 #: main.dfm:169
 #. frmMain..Panel1..cbOutputDevice....Items.Strings
 #: main.dfm:221
+msgid "COM3"
+msgstr ""
+
+#. frmMain..Panel1..cbInputDevice....Items.Strings
+#: main.dfm:170
+#. frmMain..Panel1..cbOutputDevice....Items.Strings
+#: main.dfm:222
 msgid "COM4"
 msgstr ""
 
 #. frmMain..Panel2..lbWhat..Caption
-#: main.dfm:240
+#: main.dfm:241
 msgid "What ?"
 msgstr ""
 
 #. frmMain..Panel2..cbRoutes..Caption
-#: main.dfm:390
+#: main.dfm:391
 msgid "&Routes"
 msgstr ""
 
 #. frmMain..Panel2..btnFilter..Caption
-#: main.dfm:410
+#: main.dfm:411
 #. frmMain..ActionList1..acFilterSelect..Caption
-#: main.dfm:915
+#: main.dfm:917
 msgid "&Filter"
 msgstr ""
 
 #. frmMain..Panel2..btnProcess..Caption
-#: main.dfm:434
+#: main.dfm:435
 #. frmMain..ActionList1..acConvert..Caption
-#: main.dfm:908
+#: main.dfm:910
 msgid "let's go"
 msgstr ""
 
 #. frmMain..memoOutput..Font.Name
-#: main.dfm:461
+#: main.dfm:462
 msgid "Fixedsys"
 msgstr ""
 
 #. frmMain..stbMain........Text
-#: main.dfm:481
+#: main.dfm:482
 msgid "http://www.gpsbabel.org (http://sourceforge.net/projects/gpsbabel)"
 msgstr ""
 
 #. frmMain..OpenDialog..Filter
-#: main.dfm:488
-msgid "Garmin Mapsource|*.gdb|Garmin Mapsource mps|*.mps|All "
-"files|*.*"
+#: main.dfm:489
+msgid "Garmin Mapsource mps|*.mps|All files|*.*"
+msgstr ""
+
+#. frmMain..SaveDialog..Filter
+#: main.dfm:495
+msgid "All file(s)|*.*|Garmin MapSource mps|*.mps"
 msgstr ""
 
 #. frmMain..ActionList1..acConvert..Category
-#: main.dfm:907
+#: main.dfm:909
 #. frmMain..ActionList1..acFilterSelect..Category
-#: main.dfm:914
+#: main.dfm:916
 msgid "Babel"
 msgstr ""
 
 #. frmMain..ActionList1..acFileExit..Category
-#: main.dfm:920
+#: main.dfm:922
 msgid "File"
 msgstr ""
 
 #. frmMain..ActionList1..acFileExit..Caption
-#: main.dfm:921
+#: main.dfm:923
 msgid "E&xit"
 msgstr ""
 
 #. frmMain..ActionList1..acHelpAbout..Category
-#: main.dfm:926
+#: main.dfm:928
 #. frmMain..ActionList1..acHelpIntro..Category
-#: main.dfm:931
+#: main.dfm:933
 #. frmMain..ActionList1..acHelpReadme..Category
-#: main.dfm:935
+#: main.dfm:937
 msgid "Help"
 msgstr ""
 
 #. frmMain..ActionList1..acHelpAbout..Caption
-#: main.dfm:927
+#: main.dfm:929
 msgid "&About"
 msgstr ""
 
 #. frmMain..ActionList1..acHelpIntro..Caption
-#: main.dfm:932
+#: main.dfm:934
 msgid "&Intro"
 msgstr ""
 
 #. frmMain..ActionList1..acHelpReadme..Caption
-#: main.dfm:936
+#: main.dfm:938
 #. frmReadme..Caption
 #: readme.dfm:6
 msgid "GPSBabel README"
 msgstr ""
 
 #. frmMain..MainMenu1..mnuFile..Caption
-#: main.dfm:945
+#: main.dfm:947
 msgid "&File"
 msgstr ""
 
 #. frmMain..MainMenu1..mnuOptions..Caption
-#: main.dfm:951
+#: main.dfm:953
 msgid "&Options"
 msgstr ""
 
 #. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames..Caption
-#: main.dfm:953
+#: main.dfm:955
 msgid "Synthesize short names"
 msgstr ""
 
 #. frmMain..MainMenu1..mnuOptions..mnuSynthesizeShortNames....Hint
-#: main.dfm:956
+#: main.dfm:958
 msgid "Ignore \"short\" names from source data and synthesize them from the "
 "long name"
 msgstr ""
 
 #. frmMain..MainMenu1..mnuHelp..Caption
-#: main.dfm:962
+#: main.dfm:964
 msgid "&Help"
 msgstr ""
 
 #. frmMain..MainMenu1..mnuHelp..N1..Caption
-#: main.dfm:970
+#: main.dfm:972
 msgid "-"
 msgstr ""
 
@@ -524,74 +544,78 @@ msgstr ""
 msgid "Version"
 msgstr ""
 
+#: about.pas:83
+msgid "German by Olaf Klein"
+msgstr ""
+
+#: about.pas:84
+msgid "French by Lilian Morinon"
+msgstr ""
+
 #. Programmer's name for it: SGPSBabelURL
 #: common.pas:27
 msgid "http://www.gpsbabel.org"
 msgstr ""
 
-#: filter.pas:159
+#: filter.pas:160
 msgid "Value (%s) out of range (%g to %g)!"
 msgstr ""
 
-#. will not be translated, fill by hand
-#: filter.pas:219
+#: filter.pas:228
 msgid "Feet"
 msgstr ""
 
-#: filter.pas:220
+#: filter.pas:229
 msgid "Meter"
 msgstr ""
 
-#: filter.pas:223
+#: filter.pas:232
 msgid "Miles"
 msgstr ""
 
-#: filter.pas:224
+#: filter.pas:233
 msgid "Kilometer"
 msgstr ""
 
-#: main.pas:165
+#: main.pas:167
 msgid "BETA"
 msgstr ""
 
-#: main.pas:167
+#: main.pas:169
 msgid "Private release"
 msgstr ""
 
-#: main.pas:169
+#: main.pas:171
 msgid "Special release"
 msgstr ""
 
-#: main.pas:277
+#: main.pas:279
+#: main.pas:374
 msgid "All files|*.*"
 msgstr ""
 
-#: main.pas:366
-msgid "|All files|*.*"
-msgstr ""
-
-#: main.pas:407
+#: main.pas:415
 msgid "File %s not found."
 msgstr ""
 
-#: main.pas:424
+#: main.pas:432
 msgid "File \"%s\" exists ! Overwrite ?"
 msgstr ""
 
-#: main.pas:425
+#: main.pas:433
 msgid "Warning"
 msgstr ""
 
-#: main.pas:450
+#: main.pas:458
 msgid "Could not run \"gpsbabel.exe\"!"
 msgstr ""
 
-#: main.pas:459
+#: main.pas:467
 msgid "Converted successfully from \"%s\" to "
 "\"%s\"."
 msgstr ""
 
-#: main.pas:460
+#: main.pas:468
 msgid "Success"
 msgstr ""
 
-- 
2.30.2